Fixes
commited older version in previous commit, rolling back with additions retained.