Various fixes, more USASEF work