round 2b of removing hardcoded strings. Bug fix 2