Second grabber + misc config changes