cleanup improve greeter, deal with #5