bugfixes and add alarm name fucntionality