Add export function, some string updates