Add more controls, update documentation