new stuff and a fix