Remove some extra prints, tighten up home page