Updated comments
Canvas/UI fixes