Update to 0.5.481

and small changes