Updating to Protocol 61

This should fix the connecting problems. Still some bugs that crept up, but I just don't have time anymore for real fixes.