Entertainment Group + General Fixes