Added a new alias, added some consistency dropped old shit