Fixed some probs with the thumb generation