Better errors
Merge branch 'dev' into fastmiso