New control, fix errors, etc