fix most outstanding graphite issues