bunch of changes that didn't get committed