Some comments added and some names updated