Updated

Fixed all hardcoded strings