final updates

almost ready