added more keys and some other minor tweaks.