Address Improvements per Greg Moser

Need to actually remove