Fixed some more stuff again... yo.