a bunch of changes, hopefully nothing broken
a bunch of stuff