Almost done now

some minor fixes to do