fixig, making stable, using correct Status, cleaning up