Added extraction of sourse, building cleaned up comments