Fixed Bugs from original source, added language selector to config file