cleanup, fixes, removed requestAnimationFrame