adds griddler and small changes