optimised draw and update, got rid of comment headings