added grunt support, fixed some issues detected while validating