various changes, lol