merge jeff's stuff, did a new pull request 

Brian's sprint 5, bugs fixed.