fixed smaller issues