Grunt, socicon, small changes