Add multiple point resolution
Cosmetic changes