Better handling of possible suits
Improved utilities, added some unused but broken oracle code