Finishing up jeff ms tweaks