Final comments added, neatness work