Optimz
Add ports in fast path
more fixes