Start work on triggers, some cleanup
Added triggers, fixed error messages in returns