changed prompt status colours and user name display
fixed merge conflict