Fixed some more stuff :P