Some TODOs completed and other minor modifications