Fix keyboard handler and add better sample data