Lots of fixes - halfway there