bringing in stuff from 5.0

added new options page, new languages, and various bug fixes from 5.0
master branch