Small fixes + doc