added replace to grunt; other little things