Added TODO's and simple fixes to Compositor class.