Sound added + small core refactoring