Fixed more Bugs!