Fixed the weird spacing on the waiting message
Added better code for changing status of client