dalitz bugfix and some other shit