Added some extra private config options
Adjusted some aliases