removing cruff
fixing minor bugg