Pull request for fixing minor things

All sorts of little things to fix