form fixes, code cleanup, and better handling of alert adding/removing
update for changes in core
Merge pull request #1 from ongoworks/devel

update for changes in core