Cleanup, adding user login for xml, getting ready for v 2.7.0.