a little clean up and new riftmap work