added shortcuts for modes, fixed bugs