Added and fixed commenting,