Updated block list, fixed issues with blocks being overridden.