some updates to Manticore and OSCthulhu