Language updates

this completes #259.