fix sizing and duplicate stuff