improved return codes
fix
higher priority for mysql
Merge branch 'develop'