Fixed more Bugs