got composites working again as expected, and more; small bug fixes