Bugfixes. Now implemented through v.4 in the paper