WIP some of the requested fixes