Fix stop duplication. Fix parsing errors