some more cool stuff and cleanup