Updated lots o stuff