Add more sound fx and caching