important fixes in grafing functionality et al