alerts now update
merge
removed tempfiles