minor enchancements