resolved questions and added TODOs