Fixed some more mistakes..