fixed tostring issues