lots of fixes!!!
Merge pull request #5 from talst/v6-28.02

lots of fixes!!!