Improved blocks creation. Commented swig layout.