more
final updates