source: various improvements