Responsiveness up more and bugfix