some cleanup. ready to distribute.