Fix require, annotate package better