Patched some Bugs

#125