Feature/ceilfixes