Fix comments; Fix error in functions