Fixing Bugs and adding new Functions