fixing minor issuses