Fixes (tests pass, need to deal with things in pure strings still).