new stuff and fixed stuff