Added enable-hierarchy-packages
Added enable-global-nicknames
Cleaned up code of count-colons