Straights still not handled properly! Should be fixed now though.