errors managment
Merge branch 'errors'
fix dumb things