minor tweaks
minor tweaks in TODO entries, commenting import statements