cleanups and changed port