white version updated
Added fixes from release
Fixes