Modifications, improvements and chasing down the elusive magic failure mode