added some more shortcuts, + fixes.