grunt modified and little adjustments