did some minor fixes