Added more component classes 
also misc cleanups