Minor changes; cleaning up for reinstall