Commented out debugging print statements and made printing Messages more readable
Fixed merge issues