(1) updated todo
(2) cleaned up setup file