Style rework; canvas engine fixes