Various fixes... much in progress