Add language to options

see issue #82
Not used yet!
minor optimisations