bullet fix + map made easier for testing