fixing up some stuff still have to get rid of dupes on client