Some minor changes, but closed some stuff from the TODO list