adds incremental for strings; clean-up codes