take care of a few TODOs