fixing several little things