Comments made mandatory, fixes added as mentioned by Aswin