Fixed some last Bugs