Fix merge problem
Fix problem with the serial library not liking unicode
Better error logging in GW