more Fixed Bugs