fixing parser, adding location