fixes here and there, still need to sort out the visualisation