Some syntactical cleanup
Allow port and speed to be specified on the command line