typpos + some fixes

typpos + some fixes