[#] minor changes
[-] comments