fixes some annoying changes
more annoying fixes