Prototype Feedback + Final Tweaks

Prototype Feedback + Final Tweaks