new stuff and tweaks