So many updates

Much code, very forgetful.