adding some minor fixes