add comments and switch col/row