fixed several issues with be whole.