Finished implementing outstanding suggestions (as far as I know).