Better docblocks and an expanded todo list.