preparing to pip and minor fixes