Fixes + new file