Many fixes and a few still to come