A quick little patch that adds a language selector, and has a few minor bug fixes.