last fixes - done