GreekTool Improvements