Added shortcuts and minor fixes