lotsa updates, ignore my shitty commit messages for a while please