Worked on misc TODO in preparation for work on solver

Added a methods, moved some to Util, etc.