Added application aliases. General cleanup