some bullet adjustments
merge
todo, splice bullets not on map