added enter key support
minor fixes