fix, enhance, move String to lib