fix(*): various improvements