cleanup
final fixes and cleanup