cleaned cmnds and added CommandGroup to shot with hammer