added rapid fire and minor changes