New string and some fixes

Also followed recommendations in #296