minor improvements #76