initial keyboard and some fixes for consistency