few small bugfixes
work on standardizing the templates a bit
tests for controllers