Some parser tidying, bump version, fix overlapping imports issue