Added Sound support and clean up of some headers.