getting more stuff in
More fixes
Hammering things into shape