tweaked wording, added TODO list