Merge all open Teragon fixes

Not sure what happened to the original gitorious repo; my pull requests went ignored for several months, so I am going ahead and forking to GitHub instead.