Modify settings
fix small bug
Attempt to speed up SQL insertion
Merge branch 'master' into emn