fixed even more issues