Minor Tweeks to Main