* fixes after Oleg in progress...
*fix