ogg
fixed merge conflicts
loading image + some fix