More modifications and whatnot