fixing

bugfixing and some changes