Sound load bugfix + several minor fixes/refactors