fixing several small things