Some fixes on CPU, a little better, but still a bit broken