fixed annoying context issues
final cleanups