Enable language selector
Fixing some minor bugs