more cool stuff and restructuring