fixed some port naming issues, much cleaner