- several improvements