more cleanups + nicer welcome...