WIP more fixes/tweaking