Some casing stuff fixed too