Magellan fixes and other edits.