Bug fixes for client, adding back Python server