Fixed some minor issues: incorrect file load order, cmd abbrevs...