Can now add component categories.
Did a bit of cleanup.