added port stuff and changed some naming