-updated TODO

-fixed consumption problems :P