updated TODO, fixed minor stuff