updated TODO and cleaned up fieldselect.js