Added change password, cleaned up few things