fixed even more stuff