minor changes & added TODO