minor stuff and fixes