added GS and wjacobi solvers. fixed up main