code cleanup after fixes for Handlers, new  gm command ...