removed for-in loops, fixed issue in which the text would fade/blur too fast
fixed merge conflicts