few fixes, some tests
palautus2