more & fixes, refs #34