Cleanup, fixed whisper bug