Changed to groovy, some small changes, no rave by default