fix build and minor improvements (#2)

fix build and minor improvements (#2) #7