Some updates. Minor fixes. Makefile supports now cx1