Fixed many problems for gryphon