more notes
fix some tests, port more to webapp2
more todos