minor bug fixes, major tanslation preparation