small improvements and changes