fix enclosure guids
fully implement enclosure support