Update to 0.6.520

+some small changes