Closing the ranch

Some minor improvements.