Cleaned old stuff, added whisper, also fixes