more stuff and fixes