Added support for groove and text field
Comments and cleanups