2.4 support and some cleanup for all most remaining items

still missing all consumer items