Added sound, cleaned up more code.