+ Clean ups and corrections