documentation & small improvements