minor changes and fixes, added support for tiedot