updated some names and comments