small changes
Working code, poor localization