add controller module, small updates