Group deconst added, some bugs fixed