various new stuff and fixes