updated lots o stuff