Fixed some new Bugs