Fixes to Nato gear, add cse as medical system