Merged changes

strings_draft.py is now working copy