Give the Siren enums different names than the Alarm enums
Remove part of comment
Required change to compile our code
Small changes
Oops
Make timeout configurable in include file
Small cleanup
Improve error handling
