'merge' bugfixes/structural changes from vatsim branch.