*Fixed some more Bugs