Added aliases, minor config