a bunch of changes, forgot what exactly