More PR feedback and some more fixes