fixed some smaller issues