Further improvements, refs #156, #163, #92