optimization, canvas data improvements