make more functions sane