cleaned up
added TODOs