Update
Port out of range fix and some more