few cleanups/fixes