light cleanup + RectMake size changes