general cleanup and more updates for 4.3