more cleans. moving things to where they should be