Translate, bugs and minor fixes