Various minor fixes, adding double buffer more.