I might consider not working with that company any more and hire someone else that knows what they are doing to fix up or redo the whole thing. I know that is not the cheapest thing but I would be concerned it would never be done right with current company.