Fixed some things, hopefully works now.