minor improvements, warnings