Updated comments and utf-8 encoding