final-changes

final turn in