little changes/improvements