Fixing Bugs, adding new Functions