minor improvements to sources