updated compilation errors and  minor OTA improvements