Add strict mode
Add string functions
merged updates from upstream