Just changed some stuff, so that all this is working with numpy arrays, and not necessarily frame containers ...