added server to client error messages and cleaned stuff up.