fixed serveral bugs