Fixed comments and small changes