fixed reserve name problem

massive clean-up still required