moved functions to autoload
removed 's' mapping and set shortmaps default to 1