Feature/minor tweaks to graphite