minor clean up, change groupid, use storm's carbonite