Group draw & update loops improved.