Some control code and minor changes.