Vector relabelling appears to work correctly

also some other display bugs