minor improvements to initialization