Small fixes in Theory part and also reverting build script to proper shape