next.js

e9a2576e - type refactor, minor code refactor