Renamed some things and updated todo list.