some small sane changes