few features added, still problems with sqlite