removed warnings, added TODOs