Fix comment
Move functions and aliases to zlogin; Other miscellaneous changes