added TODOs, bug fixes
bug fixes