Tweaking in some AMP code; computeSGW performance improved