Another shit ton of stuff, mainly modifications