Tiny tweaks, fixes and tests - done couple TODOs