Sorted out some bullet stuff, still not perfect