simple fixes + comments