cleanup and other small changes