Several fixes + new demos