Patched some Bugs