Fixed some minor design and comment errors