Latest fixes - rady to release