Fixing bugs and upping the nocontext limits