replace more illegal chars, think about exc re-raising, shit is still badly broken