a few TODOs done