Fixed setup, added new numpy routines