WIP lots of fixes