Some quick updates and moving things around...