Tidied up comments
fixed user status update