fixes on commits