Fixed conflicts. Added multiple bullets.

Added several states.