Continued cleaning up the client. Added some better messages to console log to see what's going on