Clean up some whitespace
Add event tracking for materials