added more options and renamed ports