Update to 0.2.5

Mush small fixes