Some triggers and error fixes
Merge branch 'master' of github.com:johnhult/DataBaser
triggerhappy