Fixing comments and [math]