small library improvements