Brushup/reorganized stuff.