new stuff and fixes