small fixes to parser, fully working import script