updated

final fixes