g15: more defines and shooting fixes