some misc work/tuning up to rage