more particle parameter adjustments and some cleanup