improve status parsing