stroke/fill order fixed
canvas interface simplified