Bugfixing, added more logging to do so
Back from buggy repo
Merge with alarm fix