fixed even more things