Patched some Bugs with Backup