final changes, should be good

....I hope