Model tweaks

Hi guys, thanks for developing this nice model. Here are some tweaks. 
Nice chatting with you Jarod :)
Sure, I just moved some stuff around to make it easier to debug in the browser JavaScript console. Sorry my changes are a bit hacky...