Added Cliopatra, and cleanup