Improvements to minimal mode. Better switch buffersç