completed merges, fixed broken RSAT links