fix for parse, and a start at db import. Using CVS as scp :)