added TODOs and notes