Corrected issues noted by Simon.