Made some improvements, removed non working examples