Minor changes to list as well as continuing additions to heap