Many small improvements