fixing warnings, updating TODO