cleaning up some puts and making sure all work together