Added translation, some generic updates, code reformatting