tweaks
controller stuff
Merge pull request #39 from wisconsinpoet/lauren

Lauren