Add ctag groovy def
Few fixes.