fix comment
fix order of variables