improved help hooks/added switch