[ADD] unlimited flight; [CHANGE] some class changes;