merged @seanwinn fixes

This totally fixes Quantum (Thanks @seanwinn & @VMTrooper). It also adds horizon, so you can see the really slick network maps.