Soem small improvements