Corrected 2a,b and some of the source code