Some improvements

First stage is nearly usable, just needs content