Updated nearly everything