some fixes lab6