add stations, areas, move isolation to its own group, various cleanups