fixes and alarm servlet