Added translations, some minor enhancements