Small fixes and add WIP futher work notes