Implement port, cleanup and version bump