moved whonix to install before groups; cleanup