Mayor improvements (from working on it 9 months ago)