Formatting tweaks
Roster issue