added TODOs + some cleanup