fixes some minor stuff like typenames ...