various smaller cleanups