Small updates and testing.