found a slight bug, also cleaned up expert controller