Fixes + comments