finishing off tagging, and adding change password