fixed smaller changes