Fixed some more stuff =)