Fix some multi-item bugs...  More fixes forthcoming...