fixed select, added todo comments