jersey mods and slight cleanup