minor fixes, shape now updates on data change