 fix the to many things
