general improvements!