various changes and a sad air prototype