Some misc. input and render related changes