reduced warnings (disable warnings locally) and NO_BULLET no longer used