Fixes for issue #24. Most controllers are now covered.
Cleanup for issue #25