Chapter 05s

Also, some post 0.9 spring cleaning.