Add --replace-source-path option

Fix indentation

more formatting fixes

Clean up help output for 80x25 display

Merge upstream changes