empty block fixes and staff changes