major cleanup, resolved suppliers/traits compatibility issues