some fixes with units building. now tested