a better string handling here and there