somes minor fixes