fixed some issues with shortcuts keys..