smal improvements