GNR-2 bugfixes and optimization with abstract code