Finish up some minor modifications still