Cleaned up todos, documented stuff

The views are slightly stronger coupled than they should.