Add further control specs to gmacs.tpl and fix input data format for fleets