First pass at General changes.