adapter: bunch of adapter fixes
application: readd a saner Application