improvements regarding #496