- various fixes