add TODOs and fix a -1 to be a constant.