bug fixes, more component types