Started 'addlanguage' and removed some unused code
fixed merge (i hope)
merge..