fixed even more things....