final cleanup
final updates