fixed some bugs, still working on parsing and db