bug fixes relating to parsing..