Bug fixes, event listener, only preload metadata