Added keyboard, some client stuff