fixes and cleanup to componentlists