database parser fixed + tested (a bit)