Comments and cleanups
Added support for groove and text field