More stuff and cleanup