Some more work on mini-buffer