various fixes
string storage
reorganized a bit