Fix constants
Add and use bullet shape constant