fixes for context losts
cleaned my traces