minor changes/improvements