some random improvements