end friday, small changes to finish, almost done