Removed numpy dependency

... anod other minor fixes