update+fixes+joriths additional code