more tweaking of ADMM implementation