fixed string error

added TODO descriptions