Merging

Merge. Also added some error messages to startclient.bat