more consistent --trace options
removed unused variables
removed unused variables
removed unused variables
fixed debug/normal builds