Bug Fixes with annotations and tracing.