Fixed awkward overlay and tuple crash, fixes #3 and fixes #4