uuid and couple of bug fixes