#4 minor but necessary improvements