fixed even more bugs