changes to keyboard and library
merging