small case improvments