Clarify code and added setXvfb option