OTA Version

Bugfixes and Improvements