Fixed more things. Test it now.