More bug fixes + filesizes