cleaning up years of neglect. <sigh>