Fixed some more controller issues

Fixed some more of the controller issues, also tested some of Shaun's
code since he didn't bother to install the rails server stuff :)
Merge Commit
More merge commits

I hope this doesn't break anything!