Minor features. Final version for now.