A few style and functional tweaks

PR modified to development branch