select boxes, bug fixing and merge code