fixed more branching also fixed overflow check, which didn't make much sense seeing as it check if a 32 bit int had a value that didn't matter