Working on multichar support -- add finishing touches