finished small changes