getting refactoring updates as well as string files

Will be trying to fix bug in next commit