added todos and tofixes