fixing the last two issues