Bugfixes + Added stub_status_module