Fix #67, main text and better localization