Merge branch 'devel'

bug fixes, mostly.