Fixed two potential bugs regarding pausing

Also updated the TODO list.