Swap gate
More type annotations; using points more foten
Merge branch 'dev'