Fixed something and adding comments