Merge pull request #213 from stavros-swmud/next-3.0

minor bugfixes after code reorganization