Language cleanup
R4: Language options and graph speedup