Knocked some stuff off the TODO list.