several minor fixes
Merge branch 'master' of https://github.com/Cup-a-SEP/OVAlarm