Committing fixes for broken stuff. More importantly "strings"