Minor improvements, and renamed functions post.