fixes + comments