WIP some port tweaks and such