Multiple smaller fixes and readme tweak