Developing: fix script assembling bugs