wip, misc cleanup and reduce some messages.