Some fixes + scream