Buffering and small GUI fixes