Misc changes
Added -port argument
Minor mod