Shape update

mostly logging
some fixes