Added some base-only blocks
Makefile modified to compile for java6