More updates...see commits messages.