new stuff and fixing old