Made all changes to the source code sofar.