added some missing fields
did stuff
added some alarm stuff