Some better responsiveness and bugfix.