removing getGroup, some Make mode bug fixes