Appt tweaks
Tweaks all around