Fixed quick shoot bug, some other fixes