More added

Added more components, tweaked existing ones.