added some minor fixes