updated for september and other cleanup