Partially fixed SYNACK issue.
tweaked a few things to help with edge cases