Fathom updates and fixes for home network project.

The code is up-to-date with the latest version (as of today) in svn + including my changes since I started to work on this.