wip
Update to Remark 0.6.0
wip