Client Feedback Fixes

Implemented feedback from 1/24 client feedback.