added numpy, minor changes