errors fixed
bugs fixed