Fix warnings--probably would have been a bug. Not currently auto-testing
Controller, since it will be used constantly by the developer and it's
not clear it's worth the effort.
Fix problem of unused vars; consolidate similar methods.
More refactoring, simplifying, consolidating redundant code.
Move 2 methods.