Update comments and readme