more cleanup & re-jig.. happily breaking everything