toggle shows now instantly, several fixes for beauty ;)