Some further bugfixing, testing and app enhancements