In process of building, many errors fixed