Some parser done, minor fixes required