fixed tool paths
fixed DB update order
Merge branch 'master' into next