small tweaks - tested and working