Some minor modifications
Some work on the SQLite #19