added some exports, and tweaked the makefile