layout: ota, ota_resist, ota_fast; and: big cleanup, naming fixes, mirroring ota_fast fixed