Fixed bullet and UI bugs
Fixed merge error
Finished merge.