fixed names
added comments