fixed bugs that were not tested….