WIP some small changes