some Bugs was fixed