Many fixes + more examples