gradually getting build fixed up