fixed import errors and port definitions