removed some TODO's
v0.7.5
less TODO's