Add: various improvements.