some progress
some progress
some improvements
some progress
Merge branch 'klim-changes'