Removed blocks, fixes most non-string values