added more grapes
updated logging
added missing validation