Bug fixes + removed submodule, added dev app for development