Several fixes + typo
Several fixes + typo