did some refactoring, started on some call trace enhancements