new stuff, old fixes