changed some names and println messsages