Merkel says Greece has more work to do