numerous general improvements, preparing for rename