Minor code improvements, updated TODO's.