fixing/tuning up