Design corrections DONE (by Martin)

Corrections, read flow, stufflikedat kthxbai