small fixups - tested and working