single hop variety fixes and cleanup