Finishing moving check closed control and other minor fixings.