Cleanup and additions as requested.