Lots of new fixes