I took a quick look at the model and gave you a few suggestions over at your FSDeveloper post.
Gavin